Styling tweaks, code cleanup