rearranging some code