Updated to standard style