Minor refactoring.
Merge branch 'master' of git@github.com:rasheedamir/fmu.git