codestyle refactor