Remove spacing issues and attr_*