Updates from PR review - code style, minor refactoring
fixing stuff