Minor cleanup for convention and readability