enforce coding convention

replaced every `and` by `&&` and every `or` by `||`
Merge pull request #361 from ZogStriP/enforce-coding-convention

enforce coding convention