Updated comments in classes