Remove resource_type from output resource.
Use lowercase for resource formats.
Code cleanup