refactoring: remove rest of plain style