Refactored setup methods and added pragma mark, added setup method