hlint and cleaned up imports