refactored less
gettin ready