doing some cleanup/rearranging