I cleaned up the code a lot.