Cleanup

Finishing commits