bit more semantic markup