fix it all up nicely