Ticket 128: Clean up imports
Ticket 128: Minor code clean up