refs #485 Clean up a bit