Smaller functions
Merge pull request #1 from feantot/develop-opl

Smaller functions