Modified parameter list for report methods, added more comments to make more readable. Deleted Entity class since we do not need it