Code Cleanup and Refactor