issue #19, issue 21, issues related to data sanitation done.