Lots of Adjustments and Refactoring