Done tinkering with ouput formatting