code cleanup, removing refactoring small repeated things..