v2

Commented, removed unneccesary methods and imports, and made more
readable.