address fritz's comments + conform to styling