Improvements to the code, without breaking stuff.