Minor Style Changes

and code cleanup