Style modifications
Merge branch 'geni.manager' of https://github.com/fp7-ofelia/ocf into geni.manager
Removed non-keyword parameters before others