Fixed legacy tagged that needed to be removed as well as tweaked formatting around a bit