Getting rid of Maybe, some refactoring.