No-op code refactoring. Readability improvements.