Separated functions into classes