Code cleaned - Ready for CSS