Code cleanup + rename Assets Images