Night's end refactoring