Modified readme file along with code cleanup

Modified readme file along with code cleanup