Housekeeping

Syntax cleanup requested by @jayschwa