Remove spaces within {{}}, no comments
More space clean-up -- grrr