Cleaned Up

-Cleaned the code a little