deleted and refacoted a lot of code and images