removed some recurring stuff