Code style fixes

Always making critical changes...you-are-welcome...

:neutral_face: