Clean code for classifier