little bit of refactor
few more cleanup