Renaming functions for better clarity