Minor celanup