Formal code review

Some formal code quality checks

* alias removal