Additional Code Cleanup