clean up for consistency