non-functional refactored

This is the best I was able to came up with..
Merge branch 'master' of https://github.com/dohnto/DigitalLighter