Removed unnecessary check.
Fixed up some whitespace issues from HoundCI