Removing conditional statement