Some evening refactor.