Improved Swift Syntax for better use of optionals