tweaks to make code format look better