clean up code a little bit
Merge branch 'master' of https://github.com/prohor33/collage-maker