Code Clean Up

Code is slightly cleaner