refactor: more coding style fixes