Tidied up the simple parts