Refactor: code style cleanups