minor fixes

removed c# habits;
replaced optionals in private members with implicitly unwrapped optionals;