more refactor things :)