Style and fixes
Move things around