Cleanup

Completing #2