Minor format and rearrange or methods, not actual code changes.