QoL changes to the code.