fix minor errors when refactoring