Cleanup

Some cleanup
Cleanup, again
Cleanup, again