Hopeful style improvements