Clean code

Please see the commit messages