Proposed code style changes, will confer with Matt