Style guide unification

by Raúl De Zamacona