Value cleanup #4
Value cleanup #5