1. Cleaned up the code, now that the code is clean possible refactor?
2. Testing the code 1 more time.