Formal code review

Some formal code quality checks

- mainly alias removal
- annotation cosmetics
- removal of unused code artifacts