small changes
trim spaces