Code improvements and some cleanup.
Merge branch 'master' of github.com:abnova/diss-floss