The two kinds of functions are also more clearly declared.