Cleaned up nicely
I think cleaning is finished
I think cleaning is finished
merged the tidyups into master branch