organized things a bit