Minor cleanup for convention and readability
Merge pull request #1257 from kumabotz/minor-cleanup

Minor cleanup for convention and readability