use do … end instead of staches
use include method
Merge pull request #438 from markijbema/small-refactorings

Small refactorings