refactor

Large-scale code refactoring with safety measures and systematic analysis