small refactoring + cleanup request