Align screen output and clean up code a bit
Merge pull request #22 from OndrejMarsalek/output

Align screen output and clean up code a bit