Code cleanup /resources