Multitude of small refactorings, mostly renaming and formatting