Removed commented out code, cleaned up other code