Make it lint... sloppy conditionals