code style fixes (feature/16)