Add comentary of class and change name