Markup cleanup

I cleaned up my code