Cleaning up

Cleaning up a bit