Refactoring / Code Cleanup