removed unecessary conditionals