Updating to trim excess whitespace