Clean up

Thanks @michaelbollig