Changed annoying code formatting and removed unneeded line breaks