Code cleanup, minor fixes and alterations.
Merge branch 'master' of https://github.com/mwagnurr/irtask2