Clean up code from yesterday a bit