Whitespace fix in 50.
Whitespace fix in 51.
Use not null instead of checking length.