Reformat code to be more PSR-[0-2] compliant

Signed-off-by: Jesus M. Castagnetto <jesus@castagnetto.com>
Merge branch 'develop'