tries to make setup cleaner