Fix comments and change single line statemant to classic if statement

- Fix a mistake in comment
- Used common schema for comments
- Change single line statement to classic if statement