Minor code changes + Updated README