added some organization; not sure if I will stick to this yet, too early to know