Restyle & sudo fix