Clean-up

Cleaned up the code