Refactoring according to Google style