cleaning up markup