Removing unnecessary conditional