Ticket 128: Clean up imports
Ticket 128: Minor code clean up
Merge pull request #166 from codeguru42/ticket128

Ticket128