Restructure and add a bit of flair