re-organized a couple lines of code