#196 Simplifying markup and code