Add comments and clean up header
Remove extra punctuation from switch