Cleaned up code

just a bit