clean up code
add markup