style refactoring; few more plugins