Code review changes: whitespace, private method and use isEqualTo