fix  Return Statement Is Inconsistent With Previous Usage lint warning

Signed-off-by: Niv Sardi <xaiki@evilgiggle.com>
fix logic illogism

Signed-off-by: Niv Sardi <xaiki@evilgiggle.com>
whitespace

Signed-off-by: Niv Sardi <xaiki@evilgiggle.com>
Merge pull request #119 from inaes-tic/xaiki/fix-warnings-and-style

Merged #119