cleaning up for consistency