Cleaned it up a bit, removed duplicates, etc.

Good job!