Refactor to improve strict compliance