cleaned up for consistency