Code-Refactor

Still needs images