organized a bit