use 'or' instead of '||'
use block strings
get rid of intermediate variables
avoid single-space hanging indent
Merge pull request #25 from matthieua/cosmetic

Cosmetic changes