Cleaned up a bit
p4#: 21924