Some clean up and styling tweeks.