Cut time in half
Cleaned up code