Simplify code slightly.
Cleaned up repository.