cleanup and small fix for resource: Should research further