Whitespace tidy and clarification of behaviour