Code cleanup

Imports simplified