Rearrange and organize things a bit