cleanup and rearranging