organized things correctly