Corrected style of coding in accordance with Google Style