Clean up

Cleaning up code