Removed some silly if parens