Refactored and renamed setup methods