Minor cleanup and prettify