Whitespace tweaking for readability