clean up conditionals with guards