moving markup for easier reading