Small cleanup as promised