Refactoring

Google Code style