Implemented short-circuit evaluation

Implemented short-circuit evaluation for `||` and ` &&`, also I've fixed
a bit code indenting.