Refactored: Removed orphan class.
Fixed: Coding style issues.