some cleanup and styling ;-)