tidied markup slighty