More organizing and cleaning up