Reworked. Now it's clean to start making markup