Cleanup: General Code Cleanup