Cleanup and markup improvement