Cleaned up imports.

Alternative for #54. Should fix #30 as well.