Removed more unused divs, changed names, simplified and shortened the code