Fixed structure to agree with styling
Merge pull request #68 from bvs90/fixes

Fixed structure to agree with styling