Apply a few suggested style improvements