Some cleanup and styling