refactor to match standard