some rearranging. nothing special...