Made the function names more functional