Remove warning. Refactor.
Make it into a class.