optimized and consistent with rest of the file