Changed negative if conditions to unless'