Cleaning Up Stuff

Cleaned stuff up