Minor cleanup and output improvements