Removing elif