Some code cleanup and styling.