Simplify overcomplicated and redundant conditional expressions

Signed-off-by: Cruz Julian Bishop <cruz@techern.com>
Merge pull request #111 from Techern/inspection-11

Simplify overcomplicated and redundant conditional expressions