update code to follow google standard