getting rid of Optional misuse