Some improvements
Some more minor improvements to solution
Merge pull request #2 from patriknw/wip-improvements1-solution

Some improvements to solution also