cleaning up, formatting markup