Pedantic clean ups