Changes based on deanj's suggestions (thanks deanj)

I removed comments that were unnecessary.
Made imports more descriptive.
Raised exception that is more descriptive.