Tidied up abit