Refactor according to last changes
Merge pull request #3 from egeloen/f-refactor

Refactor according to last changes