Consolidate functions into generalized methods