finish bringing code up to google standard