Some evening refactor 2.