cleaned up some stuff organized a bit more