Renamed setup methods and added setup pragma mark