Styling tweaks
More styling/renaming/reorganizing