Code readability edits