Small cleanup and value changes