Minor cleanup

Some very minor cleanup I found when looking at the code.