Fixed all helper functions to maintain uniformity