Review changes

+ Revised comment
+ Extra curly braces
+ Preconditions