Code cleanup

Doesn't change functionality, but makes the code consistent