Close #186

Clean imports