refactoring, renaming stuff, deleting unused code etc