small changes: renaming, formatting, refactoring etc.