A lot of very minor changes (cleaning, refactoring, etc)