Make resource_tags required and do whitespace cleanup