Removes unnnecessary if

* Minor changes to `bin`
Linting stuff
Tests