code formatting and spacing tweaks