Made code easier to read, UI fixd.