First pass through codebase: various style changes