refactor according to IDE style