Style changes, code cleanup