refactoring + performance improvements
removing obsolete code