refactor style issues