Some general things I forgot to commit earlier.
Cleaning