Code refactoring

This mainly includes two changes:
- Categorization of all unclassified methods
- Fix "dot after return consistency" for nearly all classes

Please check the source code as well as SwaLint and decide whether we should refactor anything else before we submit our next release!