refactor to google standards