Separated functions into more classes by category