Added Omni tests
Updated code to follow the PSR-2 style guidelines.