Removed optionals and explicit unwrapping