A minor cleanup I couldn't help myself doing