Improved OO Design
Removed unused code, documented code