Tidied up some code areas, lines spacing etc