refactor style fixes