Major Improvements, Refactoring