Refactoring WorldView, -Light and -Dark