fix comments and import declarations to show consequence of not being hygienic