#112 Code style improvements