Code Optimization

Cleaned up unnecessary code