Changed comments and added classes