Further cleanup and rearranging crap