Unnecessary comments were deleted
Virtual methods added to base class
Minor cahnges after review