Some improvements & formatting & fixed typo