organizing things correctly