little refactorings and cleaning
trying to squesh