remove white space and made some changes