Add comments and update function name