Cleaned up some code before starting on our update function.