Code review changes for SWC-313