Cleanup
Tiny changes once again