cleanup and small refactorings thanks eli #bayhac