Clean up

Cleaned up the code a little bit