Styles reordered, Removed unnecessary code