Refactor addresses and teachers