Some cleanup and fix an extraneous semicolon