fix
small refactorings - stressed by time