Google Style guide tidy up
General class and method tidy up