trim white spaces
update comments