Cleaning and design tweaks