Continued cleanup and rearranging