changed some conditionals for cleanliness