Code Clean Up

Cleaned Up Code