Cleaned and works

Cleaning things up slowly