Organize things a bit