Update #3

Cleaned up code