Refactoring + fixes