*coding style cleanup (added braces, spacing tweaks etc.)