refactoring + performance improvements