Add comment and remove unused variable and imports