Removed some unneeded conditionals