Feature/refactoring

more performance :)