Drastic changes, simpler and easier to read.