Small style improvements