Clean

Tested and working