code lines within 80 and removed unnecessary parentheses
Merge branch 'website_scaffolding' of github.com:unepwcmc/SAPI into website_scaffolding