Clean!

Still a work in progress, updates can be found here.