I can clean it up a bit to make it more failure proof.