Removed more conditionals
Remove the coveralls fucking bullshit
Fixed