Cleaned up code and tuned it up for demoing.