Code from Friday
Clean up the code a bit