Added Readability markup and tidies code