Tidied up the simple parts

Line length (152 characters) must not exceed 120 characters.