Formatting + made parts of the code simpler.