Refactoring + better optionals handling