Code Cleanup, OOP approaches.