Fix little thing with code-style and redundant checks