Code tidy and removed old classses and ids