Refactor to remove hackiness.