Clean Resources
Re-Design