Feature/code quality

Containes mainly comment/dockblock changes