Still working on Optimizing and cleaning up redundant files