Anoop | #00 | fixed minor issues