Added comments and renamed one class