Fixed "}" placements.
Fixed naming in comments.